Cleanup
Made it work with basic arrays and builtin properties.