FIXME: Crutch for service-specific options