Total Refactor, Seperated Entity dependent classes from context dependent ones, resulted in duplicate code in context.tt!