Started container edit; fixed container hierarchy migration