Added more functions to CompatibilityModule