Refactor property builder.