Completed the case expressions