Final (hopefully) Doctrine entity definitions