Don't you need to deal with backward compatibility here?