Suggestion for future update