Changes for new .extend syntax, changed path fulfillment