Progress on Property Editor