Added timeout (30s) for DB operations to avoid locking failures being immediately returned