Added framework and proxy's