Adding logging and configuration