[IMP] Improved template