More macros and methods
Added COM & Separatista classes for *Choice and PaymentTypeInformation, odl not done yet