Started adding category and type mangement