Added support for short server component names in json