Finished adding the mappings for question categories