Refactored disparate schemata to single file.