Added property collision detection