Adding backward compatibility