* Updated Internal Framework