Changed all numbered categories into enum form.