Enchaning values import, fixed constness