New changes with Class and Methods