added the management of the input and custom push dates. The logic for collection the attribute and value has been generalized