More design refinements