Feature/add more functools