Added support for messages from app