Improvements to entry point file

Change-Id: Ic3297d62a0bcfe9ef34a94f08486f89d4a7d71e6