Some small design change