Adding better documentation