Added entryPoints and other stuff.