Change beans as described in tasks