Added messaging handlers
Created handler as an export