Added Template based rendering of fields