Better entryPoint handling