Adjusting to conform to Android spec signature