Updated class definitions to new standard