Fifth batch of functionality enhancements