Feature/fixed category logic