Continued work on refactoring Country plugins - focusing on Postal Zip Data Type