Move mentions into aloha core