Add fields and data