Refactoring to switch to V4.support frags