New validator
Removed old database classes