Add note for future refactoring