Implemented model resolver and refactored response a bit