LPS-38694 Add in support for missing classes