add Entry attributes and delete ugly controller code