Categories fix and improvement