diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/TaskInfo.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/TaskInfo.java
index 3ed2fc51d31d..52d996cb6463 100644
--- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/TaskInfo.java
+++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/TaskInfo.java
@@ -142,8 +142,8 @@ public Date getStartTime() {
      * 
      * @return the state
      */
-    public Integer getState() {
-        return getContent().getState();
+    public TaskState getState() {
+        return TaskState.fromCode(getContent().getState());
     }
 
     /**
@@ -160,8 +160,8 @@ public String getTaskBody() {
      * 
      * @return the options
      */
-    public Integer getOptions() {
-        return getContent().getOptions();
+    public TaskOption getOptions() {
+        return TaskOption.fromCode(getContent().getOptions());
     }
 
     /**
diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/TaskOption.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/TaskOption.java
new file mode 100644
index 000000000000..657ff247def2
--- /dev/null
+++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/TaskOption.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright 2012 Microsoft Corporation
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.windowsazure.services.media.models;
+
+import java.security.InvalidParameterException;
+
+/**
+ * Enum describing options for creating tasks
+ * 
+ */
+public enum TaskOption {
+
+    /**
+     * None
+     */
+    None(0),
+
+    /**
+     * Encrypt task configuration
+     */
+    ProtectedConfiguration(1);
+
+    private int code;
+
+    private TaskOption(int code) {
+        this.code = code;
+    }
+
+    /**
+     * Get integer code corresponding to enum value
+     * 
+     * @return the code
+     */
+    public int getCode() {
+        return code;
+    }
+
+    /**
+     * Return enum value corresponding to integer code
+     * 
+     * @param code
+     *            the code
+     * @return the enum value
+     */
+    public static TaskOption fromCode(int code) {
+        switch (code) {
+            case 0:
+                return None;
+            case 1:
+                return ProtectedConfiguration;
+
+            default:
+                throw new InvalidParameterException("code");
+        }
+    }
+}
diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/TaskState.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/TaskState.java
new file mode 100644
index 000000000000..922840fd4a29
--- /dev/null
+++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/TaskState.java
@@ -0,0 +1,81 @@
+/**
+ * Copyright 2012 Microsoft Corporation
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.windowsazure.services.media.models;
+
+import java.security.InvalidParameterException;
+
+/**
+ * Enum defining the state of various tasks
+ * 
+ */
+public enum TaskState {
+    /**
+     * No state
+     */
+    None(0),
+
+    /**
+     * Active
+     */
+    Active(1),
+
+    /**
+     * Running
+     */
+    Running(2),
+
+    /**
+     * Completed
+     */
+    Completed(3);
+
+    private int code;
+
+    private TaskState(int code) {
+        this.code = code;
+    }
+
+    /**
+     * Get integer code corresponding to enum value
+     * 
+     * @return the code
+     */
+    public int getCode() {
+        return code;
+    }
+
+    /**
+     * Convert code into enum value
+     * 
+     * @param code
+     *            the code
+     * @return the corresponding enum value
+     */
+    public static TaskState fromCode(int code) {
+        switch (code) {
+            case 0:
+                return None;
+            case 1:
+                return Active;
+            case 2:
+                return Running;
+            case 3:
+                return Completed;
+            default:
+                throw new InvalidParameterException("code");
+        }
+    }
+}