Move updater logic to separate class and do aync checks
Use SafeBlock everywhere