Refactored and expanded the .sql files to include new schema