Added a bunch of methods