A few design enhancements