Clean up specs
Clean ups, add validation mapping
Fix the mappings