Start to overhaul RAND API