Adds support for manual objects. Adds new test.