Adding keystore and security