Updated extend method