Add modalComponentObject and fix for new release