APIVersion 9 + Design updates