Added IntentUtils + refactorization.