Added mates-service module