Reorganisation of handlers