Added swift '?' mark for optional attributes