Added more class methods and variables.