Added hole and ball-in-hole handling