Feature/entry controller