CSPACE-5678-D: Working on support for generating service bindings for the AddIndexHanlder.