SLI parser improvements