Changed to use plain EntityValue instead of fully qualified class name now that framework supports it