Refactor based on current requirements