Adding more methods, cleaning up some definitions