Optimize efficiency , structure and test, Update Bean