Update remaining EntryPoint to use AbstractEntryPoint