updated Entity classes, updated controller base class