Updated service provider and added main class.