Add more conditions according to specification