Add property definitions and change property names