Accecorise stump
Data-collapse fixes for non licenced
Still need adjustments in license part