Moved to use random API for REST