Add associations and comments