Refactor EComponentHolder with View support