improved native android support