Nullable Client Number plus slight rename of resource service