More changes for initial setup