api and keystore added