Add some more updates to setup file