[!!!][TASK] Doctrine: Migrate DataHandler - part 2