almost finished to refactor parameter core
some work on keystore