Update for latest DROLSKY bundle changes