Added categories and associations clarified