Use zr and zs in aSoil computation in direct field
Add another package for OSGi declaration