Updated stub generation