Keep porting from additional-extensions.py