more changes on native handler