Updated setup generator