Added level-spaces
And fixed dependencies