implemented a working VA and refactored a bit more into common (keystore functionality)