Extending the current message builder to filter out sensitive information