Add condition check