Change internal API