Documentation enhanced