Add expandability