Updates for new setup and container