refactored other components and examples based on changes in base object