Added jdk 7 support, and Vault dependency