Base Framework updates