Custom get routes
Refactoring
Adding persistence