Tweak to the order and dependency of extension points