Fix wko id generation.  reduce dependencies in data-acces