Added logging in features