Added struct conflict checks