Clean up base
Include service via registration
Use correct key for population
Include validation method
Add model and collection. Map constant