Better conditions handling