Added IMSI to the client
Refactor getSubscription function
Refactor