Added google play/map support