Fix: Restore backward compatibility