Internal refactor, parser use bscommands