Android code modifications, change in data struct