I had to perform a huge amount of refactor on code base! A new library and relared test project added. And initial results are promising! Let's see what happens next...