added comments and associations