Added initial function support