Small API updates.
Small API updates.