Apply some Java 7 Generic Syntax for simplicity.