Document Name and expand it's API