Added support for function type