added custom extras handling for android