UPDATE: More docs updates for refactor