Added host to monitor bson and changed mapping to macros