Finished generic list schema and generated object definitions
Merge fixes
Removed a bad reference to an internal error