more required changes to actually use this with eager loading