Added: Support for embedded functions