Update schema.py to keep attributes in the order they are declared