Update comments
Utility classes