Added in runtime stub generation