Refactored updaters. Not completed yet but it compiles