Fix imports + add comments model