#5 Fix Service\Base class references