Updated comments
Added 'keywords' and 'email'