Removed NotImplementedException