Class handling updates
switch to dot notation where possible