Refactor model to prepare relations on read