Improved V1 support for service plans