better extras handling in intents