Modified the account and payment models for better referencing