Feature/entries refactor