Changed all methods from class methods to instance methods for consistency