WIP - Added Object type