Removed Class.forName() calls and simplified constructors.