DAR-2703: Design changes