Added conditions to config