Improvements in the setup