Initial support for new architecture
Changed #receive_messages to #receive #and_return