Enhance system design