Updated templates and notation