Extension side of #117