Handle add/remove inside model