A couple of changes on updates, factories etc