FEAT: added support for OBJECT constructor.
FIX: minor code improvement.