Updated to new Lacona grammar syntax