Add support for prelexed
Add tests