Refactored all models - no more ids relations