Add collision check