Added methods, changed method signatures