Added methods and classes