Added a few helper classes, changed others