Add locker class, made description changes in autoinit