All OK after adding DB and logging functionality