Bug 898788 - Initial api