Added methods and class