Updated branch to fit with Tzar structure