Better Promise detection