Changed public methods to be static