I think we should begin reducing the size (codewise) of our entities using hibernate mapping's field access and lombok. Take a look at the tm-import branch for some examples. Eventually we should try and reduce the size of all our entities.