Change into bean class