Added support for session management and find my phone plugin