Moved record fields from Object to specific ObjectOfTypes
Added type-equality to build dependencies