Reorganisation of the function declarations, some more bindings