modified to enable the interface with internal-api space for