Add collision handling