Internal refactor, parser use bsexpressions