Added collision support