Update to leverage support for nesting and historical price API