Replaced route calls with helpers