Added "Simple" prefix to rest needed beans