Updated to work with master API and globals