Move extension points to L3