Add proposed structure for gate classes