Added XML stub generation;