Refactor adding property references