Feature/add logging