Adding optional id field