Greatly simplified classes and transaction types