Core changes to do expandable vs runnable