changes to support plugin development
Update with java version 1.8