Added dynamic fields