Added more syntax support for objects