Introduces backward compatibility as discussed on commit 69583fea504998ae2de401e072a5818fc6921fed