Made api more like javazone