Added extension function support