Added framework stuff