Added unified random_state