Move types related definition to the outside flow handler, only control and assignments defitintions are left in internal flow handler