Updated the service plug-in to Java7