Removed logic for Objects and Elements and changed the merged the concept into Aspects.