Change component is much more flexible now