Versatile and upgradeable

Versatile and upgradeable