Added categories and assocaition