Add TODO and SVC_SCHEME