Added inplementation of the new architechture.