Add the minimal schema again as it is still needed