DEV: Add Deal and Leg in the solution