Refactored ServiceBase to use InsertOrUpdate
Improved ServiceBase