Added serial number support