Added required * for fields