Refactor feature loading to new class