Added loading mask and new template syntax