Changing some local variables to fields
Adding required dependencies and keystore