Move internal attributes to be ah, internal - check_bundle
internalize metric attributes