Applied changes from Matryoshka