LPS-33483 move code from DataHandler to Impl and use constants