Feature/randomization

- Added randomization groups