Change to use classes