Adding @Override support.
Added support for templates.