Update to remove ORM dependency