Add bunch of changes to framework