Upgraded lib and introduced BeanModel