Change Spotlight to be a class instead of a define