Remove need for separate Entry class