Unified version with doc