Feature #64, split services