Enabling backward compatibility