Pls confirm my list of documents for retirement extension at CW

Would someone who has recently done this amid the recent changes pls confirm if my list of documents required for retirement visa extension (4th time) at CW is correct? Thank you for your trouble.

Retirement extension:

TM7 --

Bank certification of 800,000 3 months prior

Bank book with copies of name/account number page and last three months of transactions

Passport with copies of ID page, last extension, last entry stamp, original O-A visa, airport departure card

Hand-drawn map of residence (any particular requirements on how drawn?)

TM30 --

TM30 form

Landlady’s tabian baan and ID card

Rental agreement

Passport with ID page, original O-A visa, last extension, last entry stamp, airport departure card

Multiple re-entry --

TM8

Passport, no copies of pages required