We are using this class now, so we can get rid of this todo