bug fixing in keystore and continued the refactoring on parameter loader/core