Minor Design improvements