added apiId to fields