Added support for custom functions and filters
Added support for custom functions and filters