readd a version of addressable matching core as it is still on the hit list.