Fixing BUILDER_ID and MARKER_TYPE in SampleBuilder