NotImplementedException refactor 2