Update comments and enums