Refactoring everything to extensions