Updated Service Scripts