Bugfixes and update of proof-of-concept to utilize the new data connector lib