Moved
Added/changed logging
Added each callback for storage
Decreased timeout