Fix schema
Consolidate specs