[fix] return correct scope and add helper resolve method