Use correct properties order