Removed unnecessary code.
Actually added entity class this time.