Updates exception class & added new features