Added entity superclass