Changed for version compatibility