Added updatedAt column and cleaned up some
Smarter reloading and using updatedAt