Design improvments