Adds function support
Solves merge conflicts