Updated Services & MVVM Libs