Moved record related data to own partial