Added generic functions class