Align with engineering guidelines