Service structure fixes