Improve service API and permit type checking in FSI context