Updated Framework
Updated Sample