Make services and items behave more coherently