Changed accountId from serializable to String
Changed NetworkService to singleton