More use of logging