Added more fields
Modifications on templates