Similar to #13 all DB calls should be refactored to be suspendable to achieve better lifecycle management and avoid useless DB queries.