Lots of improvments on framework usage