Changes to use v5 of pivotal api