adding generic_expando type plus fitbamob support