Fixed build failure

refactored but forgot these classes