Added NA handling