Added propOrder tags to classes