Updated changes from real projects