EntryPoint improvement