Updated module to include notify service and using contain correctly.

Signed-off-by: Warren Clarke <wclarke1@gmail.com>