Some more design enhancements