Refactor to use interface{} instead of Message.