Added framework functionality