Refactor using query parameters for push