Refactored to use Fragment support library