Added Exception class
Updated classes