Changed Entity inheritance