Changed Entity to an interface