Media Session update
Code improvements