Updated setup and deploy