Refactor implementation to avoid destroy Intent