First changes for working review module