Better framework for validation gear
Integrity checks moved into database