Added final version of PrimitiveDataSource implementation.