Moved setup to script