Added more methods and variables