Did some changes in category system