Change optional attributes to required