Major overhaul to Eager Loading and migrations