Change internal API a bit