Removed tools dependency and exception handler