Added Matchsticks classes