1) Reorganized imports
2) Removed keyHash field from Entry class