Updated Android implementation up to current iOS functionality