working on adding v3 api support