Updated Structure and basic classes for service