Small additions to framework