Refactoring in future implementation