Still working on the generic entity controller