Model more of the remaining fields
Use the proper name for the installation specifiers