[!critical] Modified bean definition and bean variables