Improve extendability of the system