Restore explicit imports