Improve extendibility