#1 Fix Service\Base class references