Updated beans and template