Updated System to support mining / passing variables