Add decent parsing and tagging for nova & keystone