Added a few helper classes