Made some security related changes