Feature/better logging