Seems like implemented now. No test so far, further improvements required.