Improve random id assigment @ add for testing