Refactored round module
Merge branch 'round-refactoring' into develop