More property handling work.