Restructure mutable implementation