More organization of separate api objects, support refresh