Add some support for vector funs