changes to schema location to support AWS deployment, schema modifications