AAD-77: missing classes