Feature/3.0/improvedloggingapi