Added isFunction() and tag support