Design space improvments