#27 Design improvements