Future enhancements