Added vault support and some more javadoc.