* Make possible to include additional attributes to the span through setup * Adjust code review changes