Added framework for dynamic collision handling