Added Manila service support