Modify several interfaces for osuflow and wrap classes