Moved categories into constants