Adding notes for future enhancements