More work on message implementation