change build.message type, annotate models