Modify scalar handling