Fix blendfile to work with new structure
New stuff for context sensitivity