Add lazy types


<!---@tfsbridge:{"tfsId":2307581}-->