Refactor property from phingscripts to builder