Simplify based on RaekkeServiceProvider