dataSource fix and __type__ lowcase