Modify WPP Entry point generation to be more generic