Renamed private members, added iSecurity