Removed "*" from non required fields