Small Design improvements