Updating documentation to new the spec (Part 1)