Adding note about a future enhancement