Changes made for adding cookies and some other features