Auto updates
Refactor