Some small changes in names and add RandomNumberAttribute