Added new schema layer and updated field mapping