Restructuring and added categories