Use new mechanism to register blocks