Add capability to override Promise handling