Added constraints for Goals and Events.