Some small design changes