improve Entry class construction