Added initialization of keystore from disk