More function signatures use enums now (according to their category), instead of ints. Must check. More