Worked on entry point generation