Added extraction marker type and calculation