Added possibility of having numbers in site code to accommodate existing codes