Removed LocationDto and corrected Location