Deprecated stuff that would not be included into 3.0.x