Added methods, class and exceptions