Changes to set up environment locally