Revert "simplify things"

This reverts commit f077e3fb41997dcb38090f23e8f562de4d11af0c.
Test add lang ext function