Yep that's the idea. We can still eager load the option values here as well but I'm not sure we need that info nested here too.