Cross Waila support pt.2 and defactoring