Restored backward compatibility