Added better chain resolution