Updated market setup code