Forgot about these classes (UUID update)