Feature/external logging