More beanified attributes

More beanified attributes