2022-07-07 / Additional extension points