Improve parser, now it can parse Object type.