Add expressions for guards and body