Add classes for manual testing