Added class for MultiFunction support
new stuff