Added Rest service stuff