Reorganisation of the binding extensions - needs some resharper work