please avoid changing core, since this is not generic enough as the new structure look up here is specific to ec2 tags. As discussed try generating value_callback on the fly in ec2 that can look up specific tags.