Add extract alias + global aliases