Enchance support for >api21