Added some interfaces
Various cleaning fixes
Refactored AttributeCondition