Adding logging, options