Add collision manager (bug)