As I always suggest, please move "architecture_operatingsystem" to constants.py.  Also update other affected fields in this entire PR