Updated to Java 7
Renamed base class