Adding logging in features