Modified Service to handle object location