Minor design-changes