Updated for new Lacona grammar syntax