Added bean class templates