Some changes to rebuild the project