Imporve virual bean support