+ MetaData simplified
+ Switch from activerendering to eventbased rendering (Testing)
+ Removed unused code