Implemented better schema's and added router config.