Modify some functions signatures