Don't make manufacturer and distributor a mandatory field. Closing #8