Added support for ObjectId properties
Updated version