Design: Update to 2.3