Added UK support for 1932-1963 and refactored NI