Try to modify elements to match backend update