Moved record definitions back to object module