better handling of native components