#79 Clearer property names for including markers & metadata