Continued work on PAN Data Type