diff --git a/src/dev/peerat/framework/utils/json/JsonArray.java b/src/dev/peerat/framework/utils/json/JsonArray.java
index 3a093d2..7b503bc 100644
--- a/src/dev/peerat/framework/utils/json/JsonArray.java
+++ b/src/dev/peerat/framework/utils/json/JsonArray.java
@@ -13,8 +13,8 @@ public class JsonArray extends Json{
 		this.list = new ArrayList<>();
 	}
 	
-	public Collection<Object> toList(){
-		return this.list;
+	public <E> Collection<E> toList(){
+		return (Collection<E>) this.list;
 	}
 	
 	public void add(Object value){
diff --git a/src/dev/peerat/framework/utils/json/JsonMap.java b/src/dev/peerat/framework/utils/json/JsonMap.java
index ae6d179..994eb7e 100644
--- a/src/dev/peerat/framework/utils/json/JsonMap.java
+++ b/src/dev/peerat/framework/utils/json/JsonMap.java
@@ -18,6 +18,10 @@ public class JsonMap extends Json{
 		return this.map.entrySet();
 	}
 	
+	public Set<String> keys(){
+		return this.map.keySet();
+	}
+	
 	public void set(String key, Object value){
 		this.map.put(key, value);
 	}