Fixing the Startup class