Universal messages system added