Better handling for custom logs