Reworking to allow full variable support