Bringing update support to the MF implementation
These things should never have been committed