Support for shine 3.0.0