Refactored entry