Added object-specific functions and the ability to clone objects
Merge