Added additional cases