[Hellfish6]

I'd question adding Singapore to the Malay OOB only because the Malaysians are a potential threat to Singapore. Not a likely threat, maybe, but they have the most control over access to Singapore, and IIRC they provide a lot of utilities to Singapore (power, water, etc).