+

Added Scope property instead of using property as scope
Clean up from unsed classes