General changes in the code