Added some changes to the list of payment method and expense type ref #2, #3