The 2016 Appendix G baseline does follow the 2004 90.1 requirements pretty closely, so that approach is generally appropriate. The existing Create Baseline Building does have some limitations, however. It is based on the DOE prototypes, and does not map the lighting requirements directly to the Appendix G requirements. If the space types in your model match those in the DOE prototypes, that will not be an issue. The measure also does not address several aspects of the 2016 Appendix G, including the latest window area requirements, special rules for laboratories and computer rooms, and the rotation through four orientations. The measure also does not create a proposed model, which might have some differences from the user model. An updated version of the Create Baseline Building measure for 90.1-2019 that will address these issues is under development.