Re: [PATCH 5/5] Change internal API for consistency