added bean and when modules
added bean and when modules