Updated beans for POCs