Frm templates enhancements