Added a collsionhandling class