Fixing some design stuff and adding new dependencies for dynamic validation