Making some fiels optional.