Problem Set API improved