Moving mobile setup logic to service layer