Classes for new architecture