Ah, I just added these today. I'm happy for these to overwrite my definitions when you merge (I'm missing `lazy` but using 'joinedload` elsewhere)