Added more general purpose conditions