Changed to use App trait