Added more dynamic fields and comments