Fixed Service.php issues