Minor - Preserving backward compatibility