Adding missing methods and fixing service provider.

Signed-off-by: Euan Torano <euantorano@gmail.com>