Feature/tasx 26 refactor