Convert to internal library