Use a module since the @build ivar is going away soon