Breaking updates module completely; part of #196.