Removed old entity dependancy
Fixed polymorphic backref issue