Get rid of NotImplementedException