Updated to match command store api