Some refactoring which breaks collision handlers :D