Fix instrument api specs for refactor