Change internal API
Test Unit