Test max update
Naming some types and organizing