Added todo for namespace islands