Added cipher and password