More work on Property edit