Updated service for base functionality