complete entries endpoints and refactor