Added pivots handling