Updated #67 to included abbrevation/templates