LPS-35573 Apply datahandler pattern to MB