Review code and add init sql