Updated these classes with exception handling