Forgot to change Superclass of Entity in last commit