Added locker support