Fixed category code into new framework