Code

store: Moved object type attribute to the base object.