Incorporate the new flagSource attribute. Add some notes on data types.