added external DataSource
removed counters as they block
lookup by integer id as well
fixed merge errors