added property ordering