Ethan: Modifications so that normalized data is stored in the database.