Added Chosen support