Added a few classes, just look into the lock