additionalProperies refactor