modified structure for yuno framework