added location and gatewat lists to AccountModel