Make the LS handler a second class