Updated to support sdk 21