Before restructure into ORM/dataclasses split