Added def/match-syntax