#26 Add server short names