Updated router-core