SWE-058 - Detailed Design