--- a/src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java	Fri Mar 07 13:48:50 2014 +0100
+++ b/src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java	Tue Mar 11 17:43:00 2014 +0100
@@ -51,9 +51,11 @@
 import org.json.JSONObject;
 import org.restlet.data.Form;
 import org.restlet.data.Status;
+import org.restlet.engine.header.Header;
 import org.restlet.representation.Representation;
 import org.restlet.resource.Options;
 import org.restlet.resource.ServerResource;
+import org.restlet.util.Series;
 
 import de.mpiwg.itgroup.annotations.Actor;
 import de.mpiwg.itgroup.annotations.Annotation;
@@ -122,14 +124,16 @@
      * set headers to allow CORS for AJAX.
      */
     protected void setCorsHeaders() {
-        Form responseHeaders = (Form) getResponse().getAttributes().get("org.restlet.http.headers");
+        @SuppressWarnings("unchecked")
+        Series<Header> responseHeaders = (Series<Header>) getResponse().getAttributes().get("org.restlet.http.headers");
         if (responseHeaders == null) {
-            responseHeaders = new Form();
+            responseHeaders = new Series<Header>(Header.class);
             getResponse().getAttributes().put("org.restlet.http.headers", responseHeaders);
         }
         responseHeaders.add("Access-Control-Allow-Methods", getAllowedMethodsForHeader());
         // echo back Origin and Request-Headers
-        Form requestHeaders = (Form) getRequest().getAttributes().get("org.restlet.http.headers");
+        @SuppressWarnings("unchecked")
+        Series<Header> requestHeaders = (Series<Header>) getRequest().getAttributes().get("org.restlet.http.headers");
         String origin = requestHeaders.getFirstValue("Origin", true);
         if (origin == null) {
             responseHeaders.add("Access-Control-Allow-Origin", "*");
@@ -163,7 +167,8 @@
      * @return
      */
     public String checkAuthToken(Representation entity) {
-        Form requestHeaders = (Form) getRequest().getAttributes().get("org.restlet.http.headers");
+        @SuppressWarnings("unchecked")
+        Series<Header> requestHeaders = (Series<Header>) getRequest().getAttributes().get("org.restlet.http.headers");
         String authToken = requestHeaders.getFirstValue("x-annotator-auth-token", true);
         if (authToken == null) {
             if (!((BaseRestlet) getApplication()).isAuthorizationMode()) {