Added a couple of methods to the lib