Update to Java 7
Replaced Action with Command/Handler