[BUG #8247] Added extension points