Adds support for automatic and manual objects