Further work on Property Editor