Added generated funcs