Updates for new setup