Some improvements to simplify android client implementation