Converting required attr code over to use explicit args that are assumed not to be nil
Removing manual query string building