Refactor and convinience routes
Refactoring further