Added some more basic classes, including lock table