Changes related to issue 119. Have started implementation on Causes.