BISERVER-7589: Updated wrapper classes for AutoBean