Add function support
Add function support