Improved class design, added new user agent strings