Updated For latest beans and libraries