- Make it generic, and move it in OCA/social