Handler changes

Changes to pass messages on handler